Merge from origin/emacs-25

665be69 ; Update ChangeLog.2 and AUTHORS files

# Conflicts:
#	etc/AUTHORS

diff --cc ChangeLog.2
Simple merge

diff --cc etc/AUTHORS
index 0b300d0dbcab2e7805c480a4cd7579f360973588,e53577140e3d8cb088d5c770f25c3346d62b857e..9f951dfc1be4f55522683702cc59ddda66d350c5
--- 1/etc/AUTHORS
--- 2/etc/AUTHORS
+++ b/etc/AUTHORS
@@@ -486,8 -487,11 +486,10 @@@ Bob Rogers: changed vc-dir.el vc-svn.e
    ffap.el files.el maintaining.texi sql.el thingatpt.el vc.el
    vc1-xtra.texi
  
 -Bob Weiner: changed info.el quail.el dframe.el etags.c rmail.el
 -  rmailsum.el speedbar.el
 +Bob Weiner: changed info.el quail.el
  
+ Bogdan Creanga: changed sequences.texi strings.texi symbols.texi
+ 
  Bojan Petrovic: changed pop3.el
  
  Boris Goldowsky: wrote avoid.el descr-text.el enriched.el facemenu.el